Merge "TEST_MAPPING: duplicate test target" into main